Don't install the settings_notify_cb from here, since it may be called

	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_style_set):
	Don't install the settings_notify_cb from here, since it
	may be called before the first screen_changed signal,
	confusing the logic in gtk_file_chooser_screen_changed().
	(#148803, Abel Daniel)

diff --git a/ChangeLog b/ChangeLog
index 5faa14828a1591065bf30bf2188e492782b5448d..74c103dfed42f672d99b4104a794b26f85530991 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-08-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_style_set): 
+       Don't install the settings_notify_cb from here, since it
+       may be called before the first screen_changed signal, 
+       confusing the logic in gtk_file_chooser_screen_changed().
+       (#148803, Abel Daniel)
+
        * gtk/gtkcombobox.c: Make re-sensitivation work
        in menu mode.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5faa14828a1591065bf30bf2188e492782b5448d..74c103dfed42f672d99b4104a794b26f85530991 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2004-08-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_style_set): 
+       Don't install the settings_notify_cb from here, since it
+       may be called before the first screen_changed signal, 
+       confusing the logic in gtk_file_chooser_screen_changed().
+       (#148803, Abel Daniel)
+
        * gtk/gtkcombobox.c: Make re-sensitivation work
        in menu mode.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5faa14828a1591065bf30bf2188e492782b5448d..74c103dfed42f672d99b4104a794b26f85530991 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 2004-08-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_style_set): 
+       Don't install the settings_notify_cb from here, since it
+       may be called before the first screen_changed signal, 
+       confusing the logic in gtk_file_chooser_screen_changed().
+       (#148803, Abel Daniel)
+
        * gtk/gtkcombobox.c: Make re-sensitivation work
        in menu mode.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5faa14828a1591065bf30bf2188e492782b5448d..74c103dfed42f672d99b4104a794b26f85530991 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2004-08-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_style_set): 
+       Don't install the settings_notify_cb from here, since it
+       may be called before the first screen_changed signal, 
+       confusing the logic in gtk_file_chooser_screen_changed().
+       (#148803, Abel Daniel)
+
        * gtk/gtkcombobox.c: Make re-sensitivation work
        in menu mode.
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 9264cffeb545cbb5e3edd76f391d035901fcbc4b..bdb7e84f6dc0e324d31dfae6411baffcb5fdd030 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3810,8 +3810,8 @@ check_icon_theme (GtkFileChooserDefault *impl)
 }
 
 static void
-gtk_file_chooser_default_style_set      (GtkWidget *widget,
-                                        GtkStyle  *previous_style)
+gtk_file_chooser_default_style_set (GtkWidget *widget,
+                                   GtkStyle  *previous_style)
 {
   GtkFileChooserDefault *impl;
 
@@ -3820,7 +3820,8 @@ gtk_file_chooser_default_style_set      (GtkWidget *widget,
   if (GTK_WIDGET_CLASS (parent_class)->style_set)
     GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
 
-  check_icon_theme (impl);
+  if (gtk_widget_has_screen (GTK_WIDGET (impl)))
+    change_icon_theme (impl);
 
   g_signal_emit_by_name (widget, "default-size-changed");
 }